From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 7 Feb 2020 09:57:19 +0000 (+0800)
Subject: appDisplay: Call super.vfunc_unmap last
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~777^2^2~168
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=33ae220ad2f9cdd61ca1a6f70e208e3bfb5e654b;p=gnome-shell.git

appDisplay: Call super.vfunc_unmap last

So as to guarantee the unmapped state sticks and doesn't get toggled
back to mapped before we return.

Being in a mapped state when `FolderIcon.vfunc_unmap()` returned was
causing an assertion failure in `clutter_actor_set_mapped` and crashed
the shell.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2170
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 115285f32..77868722c 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1525,10 +1525,10 @@ var FolderIcon = GObject.registerClass({
     }
 
     vfunc_unmap() {
-        super.vfunc_unmap();
-
         if (this._dialog)
             this._dialog.popdown();
+
+        super.vfunc_unmap();
     }
 
     open() {